Skip to content

Closes #8873: Remove the outdated dist subproject #8916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 8, 2020

Conversation

iamrecursion
Copy link
Contributor

@iamrecursion iamrecursion commented May 8, 2020

  1. Removes the dist subproject as it was unused in the main and had
    bitrotted to an unworking state. This was preventing a successful
    sbt update, and hence import into some IDEs.
  2. Renames the working dist-bootstrapped project to dist as the
    latter no longer exists.
  3. Adds some clarifications to the documentation on testing about
    which tests are run when running test vs.
    dotty-bootstrapped/test.

Closes #8873
Review by @smarter

Copy link
Member

@dottybot dottybot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello, and thank you for opening this PR! 🎉

All contributors have signed the CLA, thank you! ❤️

Have an awesome day! ☀️

Copy link
Member

@smarter smarter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a few files that refer to dist-bootstrapped explicitly like project/scripts/bootstrapCmdTests that need to be changed

1. Removes the `dist` subproject as it was unused in the main and had
   bitrotted to an unworking state. This was preventing a successful
   `sbt update`, and hence import into some IDEs.
2. Renames the working `dist-bootstrapped` project to `dist` as the
   latter no longer exists.
3. Adds some clarifications to the documentation on testing about
   which tests are run when running `test` vs.
   `dotty-bootstrapped/test`.

Close scala#8873
Review by @smarter
@iamrecursion
Copy link
Contributor Author

Ah, I missed those! Should all be gone now. I can't find a single reference to dist-bootstrapped in the whole project.

@iamrecursion iamrecursion requested a review from smarter May 8, 2020 15:40
Copy link
Member

@smarter smarter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@iamrecursion
Copy link
Contributor Author

Do you have any idea why CI is failing on this? I can't see how the failures would be at all related to the changes I've made, but there may be some understanding I'm lacking!

@smarter
Copy link
Member

smarter commented May 8, 2020

Very weird, looking at the log I think that there was a race condition between github and github actions! https://github.com/lampepfl/dotty/pull/8916/checks?check_run_id=656794529 says it's running on commit 124273a but the actual logs mention commit 22fe7f6 which does not include the latest changes you did, so I guess the action was triggered before github updated the commit this PR points to. I've restarted the job to see if that helps.

@smarter
Copy link
Member

smarter commented May 8, 2020

Looks like that fixed it!

@smarter smarter merged commit f5b1d79 into scala:master May 8, 2020
@iamrecursion iamrecursion deleted the wip/ara/fix-build branch May 9, 2020 11:42
@iamrecursion
Copy link
Contributor Author

Brilliant, thank you!

liufengyun added a commit to lampepfl/bench that referenced this pull request May 30, 2020
This problem is caused by a recent change in Dotty:

scala/scala3#8916

Luckily, it does not impact the test result.
Only the PowerMacro tests use `compile` to
precompile code, and precompiling is not part
of the benchmarks.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

The dist project in the SBT build fails to update
3 participants